From: jdlrobson <jdlrobson@gmail.com>
Date: Mon, 17 Jul 2017 20:38:01 +0000 (-0700)
Subject: phpunit: Load extension unit tests for --testsuite=skins
X-Git-Tag: 1.31.0-rc.0~2694^2
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=5aa74aa7ef4b0e3c61061010ccfdcab7e934fe23;p=lhc%2Fweb%2Fwiklou.git

phpunit: Load extension unit tests for --testsuite=skins

Skins, like extensions, can register PHPUnit tests.
The testsuite interface in PHPUnit is designed to execute one run only,
so this should be based on the semantic entry of "skin jobs".
Changing the Jenkins job to run both doesn't work (only one value accepted).
Working around by running phpunit twice also seems wrong.

Bug: T170880
Change-Id: Ic04f4a842b2912574826b01b00d49db93d51c99b
---

diff --git a/tests/phpunit/suite.xml b/tests/phpunit/suite.xml
index 7babcacce0..2f19c813f2 100644
--- a/tests/phpunit/suite.xml
+++ b/tests/phpunit/suite.xml
@@ -33,6 +33,7 @@
 		<testsuite name="skins">
 			<directory>skins</directory>
 			<directory>structure</directory>
+			<file>suites/ExtensionsTestSuite.php</file>
 			<file>suites/LessTestSuite.php</file>
 		</testsuite>
 		<!-- As there is a class Maintenance, we cannot use the name "maintenance" directly -->